From 9ccea3db567f743a4c7aab3ae9ced28fd84082a4 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Aug 2009 19:56:04 -0700 Subject: [PATCH] Search /usr/share/info/emacs-23 rather than /usr/share/info/emacs-22. --- debian/changelog | 11 +++++++---- debian/patches/debian-site-init-el.diff | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a4438b220c..a1909873485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,5 @@ emacs23 (23.1+1-2) unstable; urgency=low - * Set debian-emacs-flavor to 'emacs23. Somehow that change didn't - make it in to the initial package and it was still set to emacs22. - * Add dependencies on install-info to primary binary packages and remove install-info from meta package provides. Thanks to Norbert Preining . (See emacs21 bugs #532600, #532599, @@ -26,7 +23,13 @@ emacs23 (23.1+1-2) unstable; urgency=low * Remove explicit install-info calls. Rely on triggers now. - -- Rob Browning Sun, 02 Aug 2009 19:26:23 -0700 + * Set debian-emacs-flavor to 'emacs23. Somehow that change didn't + make it in to the initial package and it was still set to emacs22. + + * Search /usr/share/info/emacs-23 rather than + /usr/share/info/emacs-22. + + -- Rob Browning Sun, 02 Aug 2009 19:55:15 -0700 emacs23 (23.1+1-1) unstable; urgency=low diff --git a/debian/patches/debian-site-init-el.diff b/debian/patches/debian-site-init-el.diff index 6022843200a..640f1434ca8 100644 --- a/debian/patches/debian-site-init-el.diff +++ b/debian/patches/debian-site-init-el.diff @@ -1,8 +1,8 @@ -* Emacs will prefer /usr/share/info/emacs22 over /usr/share/info. +* Emacs will prefer /usr/share/info/emacs-23 over /usr/share/info. Patch: debian-site-init-el.diff The value of Info-default-directory-list has been augmented via - site-init.el to include /usr/share/info/emacs-22 before + site-init.el to include /usr/share/info/emacs-23 before /usr/share/info. Index: b/lisp/site-init.el @@ -18,6 +18,6 @@ Index: b/lisp/site-init.el + (dolist (elt Info-default-directory-list (nreverse result)) + (if (and (not found-match) (equal elt "/usr/share/info/")) + (progn -+ (push "/usr/share/info/emacs-22" result) ++ (push "/usr/share/info/emacs-23" result) + (setq found-match t))) + (push elt result)))) -- 2.30.2